MergePlant

This powerful merge program uses 3-way technology, to bring you the best in modern merging techniques. MergePlant is easy to use for frequent integration of developer changes; it is also strong enough to merge branches of 3000 files each. After the automated merge operation, the program displays a list of the changes; each modification can be reviewed, canceled, edited. Conflicts are clearly shown and easily dealt with. Files and folders that have been moved or renamed in a branch are automatically found and merged transparently, making it possible to merge branches that have been largely restructured.

Requirements:

Windows XP/Vista

Limitations:

30-day trial